Don't loop over the sentinel node. (#156298, Torsten Schoenfeld)

2004-10-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkliststore.c (gtk_list_store_reorder): Don't
	loop over the sentinel node.  (#156298, Torsten Schoenfeld)

diff --git a/ChangeLog b/ChangeLog
index fe230cd79f39a7f979eae3cdb4bc6e81de140495..c95b077eb608030dadf2ca4eb3c3143f96a1977f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_reorder): Don't
+       loop over the sentinel node.  (#156298, Torsten Schoenfeld)
+
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_start_editing): Use

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fe230cd79f39a7f979eae3cdb4bc6e81de140495..c95b077eb608030dadf2ca4eb3c3143f96a1977f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_reorder): Don't
+       loop over the sentinel node.  (#156298, Torsten Schoenfeld)
+
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_start_editing): Use

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fe230cd79f39a7f979eae3cdb4bc6e81de140495..c95b077eb608030dadf2ca4eb3c3143f96a1977f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_reorder): Don't
+       loop over the sentinel node.  (#156298, Torsten Schoenfeld)
+
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_start_editing): Use

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fe230cd79f39a7f979eae3cdb4bc6e81de140495..c95b077eb608030dadf2ca4eb3c3143f96a1977f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_reorder): Don't
+       loop over the sentinel node.  (#156298, Torsten Schoenfeld)
+
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_start_editing): Use

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 9e9d48cf9443e93c498c598e2d50fed1ba517a28..e8de5f8a0a0f8787f619881d445f2bf29f21904a 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1408,7 +1408,7 @@ gtk_list_store_reorder (GtkListStore *store,
 
   ptr = _gtk_sequence_get_begin_ptr (store->seq);
   i = 0;
-  while (ptr)
+  while (!_gtk_sequence_ptr_is_end (ptr))
     {
       g_hash_table_insert (new_positions, ptr, GINT_TO_POINTER (new_order[i++]));